Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 27 Apr 2010 23:38:41 +0000 (23:38 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 27 Apr 2010 23:38:41 +0000 (23:38 +0000)
commit3710f3634049589e561b2d8e49b529fe1a67c25e
tree343a3f3061f1a3641182543db1913aa2b2df3d54
parent9ddc0b1e6889d52f3873f64ac38504bfe66be255
parent33aaa9d6d5400825c95321bf2c6c97db3c36164e
Merge from mainline.